libotutil: Make use of GBytes in ot_variant_read()

This is just cleaner; we avoid using GObject data, etc.

https://bugzilla.gnome.org/show_bug.cgi?id=706031

diff --git a/src/libotutil/ot-variant-utils.c b/src/libotutil/ot-variant-utils.c
index 0f2e57dbc12685877cc5103dd5f2e9536e7f3cd4..0bc9934a83725591c414e1ff564d62d5fd8d753b 100644 (file)
--- a/src/libotutil/ot-variant-utils.c
+++ b/src/libotutil/ot-variant-utils.c
@@ -180,12 +180,12 @@ GInputStream *
 ot_variant_read (GVariant             *variant)
 {
   GMemoryInputStream *ret = NULL;
+  gs_unref_bytes GBytes *bytes = NULL;
+
+  bytes = g_variant_get_data_as_bytes (variant);
+  ret = (GMemoryInputStream*)g_memory_input_stream_new ();
+  g_memory_input_stream_add_bytes (ret, bytes);
 
-  ret = (GMemoryInputStream*)g_memory_input_stream_new_from_data (g_variant_get_data (variant),
-                                                                  g_variant_get_size (variant),
-                                                                  NULL);
-  g_object_set_data_full ((GObject*)ret, "ot-variant-data",
-                          g_variant_ref (variant), (GDestroyNotify) g_variant_unref);
   return (GInputStream*)ret;
 }